Some fixes for stuff