Hopefully fixed build errors