Minor fixes

As we discussed earlier I'm starting to make pull requests from my fork