Prevents Circular Dependencies + Minor fixes