Some small updates to attempt more friendly behaviour