Few build error fixes