Final patch fixes