Fixes for the previously made features