fix warnings and margins