Resolved ASAN issues