Fixed issues with variable instance types