Fixed: build problems