Fixes for ato's review