Fix some issues I've had