Socket fixes, lint, nitpicking