Bug fixes by Nuno