Fixed svace warnings