Fix for incorrect mode setting and update code to face/object.select