Fixed some issues with subset for speed