Fix binstubs