Fixes and port config