more fixes for intellisense