Fixed small misc issues