Minor fixes according to the previous commits