Various constructor fixes