some drunk fixes