Final (?) fixes