#13 Hot fixes