Nando code fixies