Fatal errors fixed