Fixes

CC @sethladd