Fixed the remaining two issues