Profile edit fixes