Fixed shift issue + other