Additional bug fixes...