More build fixes - Will rebase as one commit soon