More padding fixing
Final (?) padding fix (for now)