@SLaks, all issues are addressed by 6ecd8db.