Fix build and changes smartass