Fixed some issues after upgading