Some smaller fixes