Fix miscellaneous things