some fixes for passing redmine tests