Fixes and updates from github