Few fixes, tweaks for Netty