Two more problems done.

Signed-off-by: Joel Roggeman <joelroggeman@gmail.com>