Minor fixes, copied last to RED