Fix buildmacros