Minor tweaks
Bumped to version 3.0.0-a054cf2