Initial commit
Port fixes