Small fixes and tweeks