Parser and sample - fixes