Fixes for things.