Detail bug fixes