Fix some issues with 4c3461c
Bump version