Small armor fixes in models