Collection of fixes

Collection of fixes I've been saving up for a month.