Overall fixes