Resolve align-problems