Completed wheels fixes