Final minor fixes