Issues fixings

Yep