Fix some minor issues and add in method locks.
Update gem version