Intellisense fixes