Fixes for various things