Fix some basic build errors