Fixed mode parsing issues