Fixes in porter