Fixed some derpiness with name padding