Fixed some issues with the feature layers