Added security for Console
Various fixes