Fixed: Minor issues