Fixes and tweeks