Update gschema overrides and fix Makefile