Sveral fixes