Fix build: cannot find oct.mk
Moar fixes