[Anton] More bug fixes