Alignment and various fixes