Fix alignment issues on simple master