Minor build fixes

Please do verify!