Small fixes for build restrictions