"Fix some spider issues"

Signed-off-by: Ionut Radu <ihonius@gmail.com>