#490 Issue ext fixes