Fix issues with building on frigg