Code tweaks [MRB]