Fixes after code clean up :)