Added some alignment checks