Small fixes, removal of singletons and static methods