Improve codacy mark, error prone fixes