various fixes for usage