Some more changes due to new release