Fix some issues with the build

Merged Rodney requested to merge dobey/maliit-keyboard-git:fixups into master

Merge request reports