Fixing some problemeos