More opt. bug fixes