Minor improvements on usage