Bug fixes / improvements (alignment with Gold).