One Pixel TWB: Bug Fixes

Just a Bug fixes