Fix minor stuff for better and more consistent protocol support
Administration for v0.3.0