Couple bug fixes

Really uneventful night... Hopefully better tomorrow.