Fix get/delete column specifiers & some cleanup