Minor changes
Apply some changes from gelbooru branch