Making stuff a bit more stable