Cosmetics & a short fix which may caused a crash