removed some compiler warnings and dependency loops