Some style fixes for the backend