minor fixes for now