fix strict errors
security changes