Small bug tweaks