edit setup fixes