Fixes for things