More misc bugs