Usage bugfixes