Updates suggested by kerrizor