Fix a FIXME
Remove use of deprecated functions
Don't use deprecated padding/alignment properties