Move fixnum override to lib