Fix several details