Add minor fixes to pass build