Instance Controller fixes