Make implicit conversion explicit
Fix some alignment-related issues