Minor fixes with commonds