More bug fixes...