AGP-269: Fix some more issues