More cool fixes