Alignment updates, update to TF-Versions