Super minor improvements