Some bugfixes for align environments