immediate fixes to the last build