Minor fixes for compatibility between versions 

Fixed some bugs reported by @ruddawg26