Fix issues with building