Fixes, improvements, and utilities