Fix port
Proper logging