Minor Bug Fixes

Breaking the code freeze here: not my fault! They were bugs…