build fixes & parese maker stuff