Fix sansiolabs issues