Added strict and fixes