A few patches for tapkee