Attempt at fixing various issues

This fixed #63 and #64 in Unify. Also fixed other warnings that Intellij
flagged.