Fixes against Brady's suggestion