Some fixes for thee