some minor fixes for now
some minor fixes for now