Fixed alignment errors