Minor fixes, resolving build errors