e-Notice fixes