fixes for various things