tweaks for correct building