Some changes I haven't commuted

=D