Small bug fixes, may help build