Small fixes, check isset result