Hi, boobyf.
For 16d., think window on ship (8), and take away the abbreviation for Right. Answer- cave, or road hazard!
For 17d., think one (1), followed by synonym for mystery (6), reversed, and last two letters transposed. Think Lennon!
Hope this helps,
Al Issner