Small fixes to szybko parser