building bugs fixed