Small improvements and utils