minor fixes for flexibility