Attempt to fix template dependent issues