Minor changes to avoid possible conflicts