* Various fixes