Some more opti slim fix ups