Multiple fixes

Done.