* Minor improvements for convenience