Hopefully fixed jQuery issues