[Matahari] Misc fixes to allow compilation