Fix alignment issues (can remove a clang warning, and also makes our code more portable!)