fixes for rake errors and warnings