Some issues with cyclical dependencies