Build fixes, changes: