Some fixes for shtuff