Instatiation / state fixes