Minor fixes to the last commits