Fixes by Florencio