Port fixes, removing hard codes.

Run in stage.