Fix serial/scale support

Closes #35