Fixes and hacks around view