BUGS 14025 and 14476 IMPROVEMENTS