some minor fixes for now