Fixes for pkglint warnings (tabs and fields order)