Minor bug updates