Fixes for strings and error logs