More opt. fixes