Fixes after Kamil's review