fixes for features