Various fixes for tapkee integration