ADd fixes and rebuild