Several usage improvements